Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add integtest.sh script and remove integTest dependency on integrationTest task #4866

Merged
merged 5 commits into from
Oct 31, 2024
Merged

Add integtest.sh script and remove integTest dependency on integrationTest task #4866

merged 5 commits into from
Oct 31, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Oct 31, 2024 •
edited
Loading

Description

This PR ensures that the integ tests run as part of the release process are run against a target cluster with all plugins installed (such as the release candidate for a release).

This PR:

Currently, the security plugin will only run tests in this package for release time integ tests. There needs to be additional work done in a future PR to see if more of the integration tests from the integrationTest source set can be run at release time as well.

integ tests are triggered by the build with the command here

Verified the tests pass with local build:

➜  security git:(add-integ-test-sh) ✗ ./scripts/integtest.sh -b localhost -p 9200 -s true -v 2.18.0
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.10.2
  OS Info               : Mac OS X 14.7 (aarch64)
  JDK Version           : 21 (Amazon Corretto JDK)
  JAVA_HOME             : /Users/cwperx/.sdkman/candidates/java/21.0.3-amzn
  Random Testing Seed   : 3A71DB12039B3821
  In FIPS 140 mode      : false
=======================================

> Task :integTestRemote
Oct 31, 2024 12:04:33 AM sun.util.locale.provider.LocaleProviderAdapter <clinit>
WARNING: COMPAT locale provider will be removed in a future release

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

For more on this, please refer to https://docs.gradle.org/8.10.2/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation.

BUILD SUCCESSFUL in 10s
7 actionable tasks: 1 executed, 6 up-to-date
  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

Issues Resolved

#4805

Check List

  • New functionality includes testing
  • New functionality has been documented
  • New Roles/Permissions have a corresponding security dashboards plugin PR
  • API changes companion pull request created
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@cwperks
Add integtest.sh script and remove integTest dependency on integratio…
b126c68 
…nTest task

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Update default credential logic
fd2a3a2 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
chmod 755
c804b42 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Set OPENSEARCH_VERSION
3302ed0 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
nibix
nibix reviewed Oct 31, 2024
View reviewed changes
build.gradle Outdated Show resolved Hide resolved
@reta reta mentioned this pull request Oct 31, 2024
Closed
5 tasks
derek-ho
derek-ho previously approved these changes Oct 31, 2024
View reviewed changes
@cwperks
Add maxHeapSize back in
26159eb 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@codecov Codecov
Copy link

codecov bot commented Oct 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.83%. Comparing base (128a304) to head (26159eb).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             2.18    #4866      +/-   ##
==========================================
- Coverage   63.85%   63.83%   -0.02%     
==========================================
  Files         330      330              
  Lines       23090    23090              
  Branches     3739     3739              
==========================================
- Hits        14744    14740       -4     
- Misses       6516     6519       +3     
- Partials     1830     1831       +1

see 4 files with indirect coverage changes

@cwperks
Copy link
Member Author

cwperks commented Oct 31, 2024

All CI Checks are green. @derek-ho @nibix Does this look good to you?

@derek-ho
Copy link
Collaborator

All CI Checks are green. @derek-ho @nibix Does this look good to you?

Approved

@cwperks cwperks merged commit 60ed8c7 into opensearch-project:2.18 Oct 31, 2024
80 of 81 checks passed
@cwperks
Copy link
Member Author

cwperks commented Oct 31, 2024

I will forward port this to 2.x and main branches along with other changes from #4866 (comment) that were not forwarded ported yet.

@cwperks cwperks mentioned this pull request Oct 31, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nibix nibix nibix left review comments

@derek-ho derek-ho derek-ho approved these changes

@DarshitChanpura DarshitChanpura Awaiting requested review from DarshitChanpura DarshitChanpura is a code owner

@peternied peternied Awaiting requested review from peternied peternied is a code owner

@RyanL1997 RyanL1997 Awaiting requested review from RyanL1997 RyanL1997 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@willyborankin willyborankin Awaiting requested review from willyborankin willyborankin is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cwperks @derek-ho @nibix